Fixed wrong git conflict resolve #4071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Closed

manindersingh wants to merge 1 commit into symfony:2.5 from manindersingh:patch-4

Contributor

manindersingh commented Jul 30, 2014

No description provided.


          Fixed wrong git conflict resolve

db88baa

Member

xabbuh commented Jul 30, 2014

@manindersingh Thanks for the fix. But someone already provided a patch in #4068.

wouterj closed this

Member

wouterj commented Jul 30, 2014

I'm sorry to close this one, @manindersingh . I hope you're next fix will be merged!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet